Merge "fix package path and move files under doctor_tests"