Add new passing tests, fix a couple of issues