fixing the basic unit tests