Remove some hard code, add script to run cases