Improve testing facilities
More tests work
Stand