Rework behat tests

* Add Id concept
* Add collection for building