Merge "Add basic integration tests for shelf" into tm-dev