Added Map Tests