Finished updateBoard and tests for it
Fixig merges