TestEnumerationConstant start and some small fixes