Added test and location scaffolds and kaminari