Refactor of King specs