Add tests for supports
Tweak tests