fixing tests, making things more understandable