More tests & small fix.