fixing tests for fixes