Restoring some tests
Merge branch 'master' into for-loop
Expression as for-loop initializer