Ready for integration tests for #141.