Completed Image class with tests