Clean up tests, errors in images now make the tests fail.

Fixes #18.