Corrected tests to reflect new specifications