Update tests to new definition