Fixed 3 failing tests