MNT: Updated tests to cover more code