Better, more comprehensive test program