Improvements in test