updated to play 2.1.0, added tests