Updated  and added some tests.