Moved test in a better package