and of course, now that I did it properly... back to failing
added some logging to tests
fixing tests, first pass