Small groovy tweaks on junit cucumber test runner.
Tweaks to mongo queries in server script.