converted tests to xunit
some tests renames & fixes