Removed some tests... more maps...