More improvements in tests