Fixed unit tests after intro custom exception