Update config test and tidy some imports