More useful short tests
Added map structure for generations