Updated unit test s by support methods