Fixed the 2 failing tests