Remove use of xbase-lib in tests