added another psycholocation test for #254 and fixed map generation so that testobject rooms are always included, but not against their own rules