More tests
Tests passing again
Merge branch 'chip_registrations'