more test progress; clean up a bit