changed amenity creation
fix tests