fix failing test
quick hack to fix 'if statement after class statement' case
fix another failing test
allow gc after test to be switched on/off