(fix) makes all tests pass
(fix) renames dealNewControllerSpec from makeLockCon..