more automation of test logic