Added more test coverage, test macros, and refactored where necessary.
Merge pull request #13 from CabForward/adding-to-test-coverage

Added more test coverage, test macros, and refactored where necessary.