[Issue #188] [WIP] modifies test code to match code conventions