Setup to work nicely with all systems
Get 2.6 tests functioning