Improving test coverage and adding useful utils