Fixed issues matching tests to positions in files