Unit-tests improved