Use with context in the tests from master. Fix some indentation pb.