Fixing unit testing