Add Additional Unit-Tests And Pre/Post-Condition Checks