|#000|+Shilpi| refactoring functional Tests, inline some methods, using camelCase, reducing number of parameters in setup method