Corrected tests to reflect changes in methods