typo
tidy tests
refactor to use fallbacks instead of a giga-if-else