Fix Test classes