Passing 1/4 failing tests now