added defaultcontrollertest, some tweaks