Restructured express config code, removed serverTest as the config code was moved out to a new module