Adding Unit-Tests