Refactor specs & test layout links