Fixed failing tests - needs proper test refactoring