More tests from current project, plus fixes to get them working.