Add tests to check charge switches for unbound holders