More testing utilities + tests