Cleanup ProcessBuilder, work towards getting tests passing