Integration of 'Store' and test updates