Fix Unit Tests for Class vs Instance