Add guard and a few gem modernizations
Move specs to the proper place