Update base framework and changes to TestEditor