Exceptions and tests changes