Expose locking class for testing.
Add tests for loading, locking class.
Better labels.