Bugfix for tests and autoFix method