Implemented 'Incorporate integration test and implementation' TA21

Remove if it's unused