Test className manipulation and fix some associated bugs.