Fixed the 7 failing tests