Let's get testing up to date with master :)

[ailurophilia]

I think I somehow broke the correspondence between the testing and master branches in this repository, so this is my attempt to fix it.