Made minor modifications to unit tests (removed some comments, changed method names, added braces)