added user populator extension
make test cases execute both user and tenant modes
fixing the test failure when running both user and tenat modes