(#913) - Seperate integration and unit tests