Update tests to account for api rearrangement