If you want, I can add tests for these tomorrow night.