Inlined switch statement into enum. Added additinal test to cover tutorial section.