building again

but still lots of failing tests
Tests back where they should be

Only things failing are not implementeds and xml not found