Make specs pass
WIP towards rails4 compatibility