Try to come up with fix for tests