migrate models to new pattern and fix BDD tests