added test, corrected all the tests