Framework and test changes