Change some Board instantiations
Tests!