Merge "Update user guide on manual tests"