Add EntityTestMap and EntityTestScreen. General cleanup.