Further framework updates and test program changes