WIP integration and unit tests