Accounting For Within- And Between-Locus Dependencies In Marker Association Tests