Moved specs to a more tabular strategy