settings checking to its own file and fixed tests