cleaned up paths.  fixed waitfortestcase