Added some new tests, modified others for better code coverage