Can you remove switchProperty and restoreProperty and use MocksHelper instead?