WIP. Working on test fixtures