Unit Tests finally done