Added more tests, fixed the remaining failing test