add tap sources and re-add test.c