Further framework and test changes