Add more tests and better test progress reporting