Add some small test workarounds