More tests and fix siblings.