Added Supporting Unit Tests