Unit Tests

Increased code coverage to 98%.