fixed BDD tests, adding more to test new api functionality, added skeleton flatmap