Further removal of duplicated spec setup