Improvements on testing