wip Adding / fixing tests.