Removed prototype class and updated tunnel connection test to provide
more effected error messages.