temporarily fixing tests, until they can be properly fixed