Fixed test through removal of old #name meta tests
Less debug output
Renamed @variable to @field
Corrected collectFields()