Added floor and map test