Refactor Images
Build image tests