Refactor tests after Concept was made compulsory