Moar tests, and moar tests coming