Cleaned up tests and addressed reviewer comments