Tabs to spaces
Change unittests to use UFCS