More tests - especially 'variables' test.