Fixing tests
fixing tests?