additional lint changes, there are some failing modules to fix, suspect model and fixture