Added Unit-Tests