Fixed missing definitions. Runs now through all 5 tests