Fix failing tests caused by already existing classes