Better test structure
Better rake ci task