Clean up tests and begin image module