Fix tests for arb-instances, add classes tests.