Added image loading, tests