Merge pull request #759 from Alex-van-der-Peet/master

Got more tests to work, still working on the rest.