Interim commit - further integration testing mods