Fix for class="multiple classes", remove init-val test