Fix map catalog unit test, fix plugin unit test