cleaning up and adding tests for ExceptionUtil and Router
roll back Router singleton requirement