Added fixes for unit testing and refernces for try/catch/fail page