Continuing to implement exception system

More tests added