[Subhas/Faris] Refactoring tests.