Unit-Tests improved