Adds some more testing to boost coverage