test conversion: move old-style test to new-style test
test conversion: remove template for old-style tests