add err bdd and speeding up tests