refactor test table, more clear perhaps