BoardRefactor + Tests