Added new tests and removed warnings.