Add rest of adc tests
Renames & build fix