Repair unit testing
Make board view more readable