Refactor board plus tests