Testing related enhancements