more tests ported to table-driven approach