Singleton and Delete

Refactored Test Server as singleton and added delete handlers