Changes the fixtures to be a bit more appropriate...