#23 tests pass on 403 and 331 now, some cleanups to conveyor broken by findbugs flagged items