Merging Rene and Fredriks Play App work
Fixes Play Application tests