Slightly better testing; image post flexibility.