initial changes for testing framework