Fixed label construction, solo-testing added