Various improvements to tests / minutia