Added Concert and modified unit tests