Add pending specs for the big refactor. #631