Cleanup number of tests code