Beef up testing infrastructure
Clean readme