Concept test & theme concepts test fix