finish switch and if expressions, all tests passing