Restored test framework functionality