Add more present tense tests to catch some edge cases I've missed. Currently failing.