Moved test class to correct package

signed-off: andcoe