Issue ITTE-510

Minor changes on exception handling and testing. Handled some of the
poorly handled exceptions and changed the tests to use the local user
settings so they can be OS independant.