New test files for test refactor &  associated code refactor.