Finished porting image tests to rspec