fixing tests..