Fixed some warnings and a failing test. One test still fails, McRunnableTest from the old code. Investigation in progress.