Part of Enumeration test and some other changes