Some Exceptions and Tests added