Finished first half of Option Menu user story and fixed tests