Enhanced Testing Coverage

[xmljim]

Build out Unit Tests so that every module (except Model) has at least 85-90% coverage