fix / cleanup / tests for name as string with $