cleaned up tests, added comments