split out tests and fix image paths