ran code analysis and fixed naming for tests