Added 40 more tests and made them pass