More Unit-tests