Updated and added new test.