Fixing failed unit tests