Fixes issues with tests passing