Fix tests and CS after rebase