Corrected rushed typos and tests back to passing =D