Fixed to run unit tests