added more unit tests and simplified context validation server details