Added prefix check to mock Account/Container also