Revisions to locking - smoke test - updates to mockstack