Test against 1.6 and master