Clean tests bench

Fixes for #15