Initial tests

Merging this back into the master branch, I guess so that I can then access it from other branches. I think that's how this works.