Removes vpath and fixes building test