tweaking old tests for compatibility purposes