fixed exception message
updated tests due to latest changes