Updated unit testing