GitHub #45 - Adding tests and test fixes.