Code clean up, image account request tests