Reverting initial bdd tests, to start from scratch
Re #20 - Added query resolution tests
Re #34 - Renamed null state from "_flow" to "_null"