Fix non-exaustive pattern matches
Add ommited test to the suite