similar table-driven tests everywhere, more tests