Further framework development and test code