Extending the Unit Tests and making Admin Email configurable