Refactoring spec and grape-tweaks