Unit testing fixed