removed dependecy on fixtures bundle, WIP tests needed