BUG-16781 fixing tests to work