completed unit tests (again)