More tests

Okay, these should be back now.