Fix all the tests that broke with the refactorying

Created by: IgorVictor