Improvements in unit testing