Added further Unit testing.