More lock splitting in the controller
Fixed some failing tests
Merge pull request #23 from cafarm/lock-splitting

Lock splitting