Adding Unit-tests