added new exception type; extended tests