Improvements in testing