Updated tests for improve code coverage