Added testling. Replaced tap for tape