CDB-1306 Proper cleaning of tests. Also fixed problem in the model triggering twice the creation of named map