Removed dependency on tuxedo; fixed unit tests; working towards further dependency reduction