Ported more tests from image