Further improving self-hosting
Fixed some project settings in self-host
Extended test data generation
Cleanup