Fix problem with mutiple mocked modules
Lint
fix problems with lint rules