In progress locking tests (really just transferring to new computer)
Merge branch 'master' of https://github.com/dtex/spas