Remove junk code and comments, added useful comments, Remove 'Y' suffix from test methods