change where test case files are loaded; style fixes