unit testing almost done now