fixing all tests for the feature on this branch