Fixing unit-tests