Update Java Tests for the correct version (been broken for ages, thought i'd fix it now)
Updated Images, Removed some PMS legacy images