Fix tests after rebase. CS fixes