Applying CR feedback. Setting attach point enums explicity to values to allow flags to work properly. Adding additional tests