Added updated tests