Fix/integration and tests