A bit of tests added.