Move board tests around