Cleaned up test image specs

Sat down with @delfick and went through some code.

Ended up cleaning up these tests.