Cleaned up Master test code to better reflect Coding Guidelines.