More tests more utilites...