cleanup test, better perf test data
simplify and cleanup code