various bits around testing
More test stuff