Refactor specs for includes