Removed: duplicated code in tests module.
Changed: tests module tests to be more strict.