Made some minor bug fixes and config files for most test cases