Attempt to fix class loading for tests