Add 40 more tests & make tests pass