Fixed tests to allow running in subfolder