cleanup and map tests