speed ups and tidy ups
expanding test coverage