Ajay/Ashwin | #3067 | Correcting imports and fixing tests