plug and play test case fixes