Fix problems with test()