Updated features & other tests & config