Fixturize

Change-Id: Ie2319d74181f9f1d3496602b923b583fa942c25c