Remove self_test dependency