BDD testing base function restored + minor tweaks