Fixing NYI stretch goals >_>

copy-pasta is bad...
Adding basic unit tests around edge cases