Navaneeth - Fixing tests, Marked changes to custom additions