Signed-off-by: Kim Brose <kim.brose@rwth-aachen.de>

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

* hasParameterOption has an additional default value which we must match
  in the return map
* Fix deprecated getMock calls