[Garima] refactored tests