WIP Added some relevant fixtures