Fixing tests and methods