Added unit tests for extracted classes | <Ajay>