Added more unit tests to AspectOpImageTest
Cleaned up test code