Dropped six requirement (still needed for tests)