Improved The Test Suite

This gives us a much better code coverage.