Minor fixes to conventions, hook up simple test.