changing to integration tests, many fixes and addition of configurable inclusion order