Added updated unit tests