Fix for test instance creation