Avoid re-starting Play in tests (and other code cleanups)

And few other improvements suggested by IDEA