Completed all tests on TODO list