Added further tests
Tests Modified. Completed.