[WIP] Get Convention Tests Passing

Fixing #361