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

Lock splitting
Merge branch 'develop' of https://github.com/Symphony-DAS/symphony-core into stim-gen