Added new real tests
Updated existing mock tests