Worked on passing some tests