Adding more conventions and tests