Resolution adjustment and more tests