counter* needs to be renamed here too
Update tests for sourcedict changes