Update tests to new API