Working on passing more unit tests