Switching to libtap for testing