Reindented, tests work for non-exception throwing.