Refactor test case for single instance

Refactor test case for single instance