Adding the basis for functional and integration testing