minor consistency fixes, test update