Support for loners
Adding exception testing