Continued developmet - added exception testing