Reduce number of api calls in specs
Reformat specs