Updated Test classes