Cleaned up test and imager files