Revert "Merge pull request #2 from eduncan911/master"

This reverts commit b2f7fdb33a3331e827ffa7120342954570040cf6, reversing
changes made to 7d0aa903defe0e5c7a8845bc5e526782ca59fde0.

Whoops.. Accidentally merged too much, using the github UI
fixing a bdd_test for required 'Test' prefix,
also removing uneeded ()s (go fmt removed it)