Handle some edge cases and flesh out parser test