think I am done with improved test code, time to test