Added in support for a simple source-validator function, added some more tests.