Added and configured Unit Tests