Added ~70 Unit Tests