Fixed two broken tests