Merge pull request #5 from whiskeysierra/feature/optimistic-locking

Implemented optimistic locking
Restructured constraints tests
Refactored some scheduler tests