Remove additional self_tests to prepare to push only C changes first