First test pass with the new lock/meta architecture