Adding Test classes to pass equivalence test