More Tests

Exactly what it says on the tin.