Added zoom x2 functionality, and renamed tests to be more consistent