Simplified startup and shutdown
Unit Tests