some small adaptation; commented out one test