Tests fixes

Refs #6. This is only the stuff that I saw right away, will continue on.