Testing

All the tests are probably broken, sorry. Merge anyway.