updated tests with the fixes