Implemented CatanMap tests; fixed bugs