adding exceptions
refining tests