Update tests to bring this beast up to 100% coverage!