Port fix for create tests from javascript build branch