split requirements files back out, fixed messed up test config