corrected errors, tests passed