Work on passing test and config files