Improvements in tests