Alter tests to use old syntax so we can test against 1.8