Includes at top level
Adjustments to tests
no tests in the master version