Added convention tests
Renamed conventions
Reduce option sets