Optimised tests, updated to play 2.2.2