Refactored test classes

@MishraMayank