Merge "Moved tests out of config test directory."