Rollback to play 2.1.1 + remove test/