cleaned up tests, not sure if it's an improvement