Removed vestigial exception and added final unit test