almost done with unit testing