Added missing tests for parts not covered.