Updated unit testing classes