Updated tests for better coverage.