Updated tests

Covering a little more