* fix some test which are not running * resolve code review comments * Moved cleaned up tests to unit tests (as they are unit tests, not integration tests). Removed tests marked as no longer necessary. Update tests name to better reflect test case. * Made explict test faster so it could run on the pipeline. --------- Co-authored-by: Andy Butland <abutland73@gmail.com>