Tests

Merging it now so that potential contributors are writing stuff against this version.