Added a new test and some aestethics.