Added more extensive deriver test. Also fixed some errors the new test revealed.
Merge pull request #82 from elvisisking/vdb-deriver-5

Added more extensive deriver test and fixed some errors.