Some tests have been added.