Refactor board specs