WIP: Partial migration of test-app to Play 2.2.