Update tests to reflect changes