Reorganising fixture; write some tests