Moved test from feature into unit