test added, exceptions edited