removed comments, finished test cases