Add more tests
Merge support modules into 'configs-support'