wip -- more tests, move impl checking into wf