Slight improvements in tests