Do not use :id in tests
Remove obsolete function idx
Simplify function add
simplify condition (kibit, this must be YOUR job ;)
do not use :id in top function