Fixed failing tests due to last refactoring... well not quite all
failing tests :-)