diff --git a/src/models/networks/model-net/model-net.c b/src/models/networks/model-net/model-net.c
index 6b3bf53fa488675cc7d49bcec6d8b413e451f133..6ab19f93362088f5206e9d76d9baf5d0fe696485 100644
--- a/src/models/networks/model-net/model-net.c
+++ b/src/models/networks/model-net/model-net.c
@@ -165,7 +165,7 @@ void model_net_add_lp_type(int net_id)
        lp_type_register("modelnet_simplenet", model_net_get_lp_type(net_id));
    break;
 
-   DEFAULT:
+   default:
     {
         printf("\n Invalid net_id specified ");
 	exit(-1);
diff --git a/tests/modelnet-test.c b/tests/modelnet-test.c
index c3097a5caedb49e61061e4a976c3296605ee0d3f..be5a5ec012bcfaaa8473486ce18c7e07edf0feea 100644
--- a/tests/modelnet-test.c
+++ b/tests/modelnet-test.c
@@ -156,7 +156,7 @@ int main(
     {
 	    printf("\n Usage: mpirun <args> --sync=2/3 mapping_file_name.conf");
 	    MPI_Finalize();
-	    return;
+	    return 0;
     }
     MPI_Comm_rank(MPI_COMM_WORLD, &rank);
     MPI_Comm_size(MPI_COMM_WORLD, &nprocs);
@@ -170,7 +170,9 @@ int main(
     model_net_add_lp_type(net_id);
     svr_add_lp_type();
 
-     codes_mapping_setup(argv[2]);
+     configuration_load(argv[2], MPI_COMM_WORLD, &config);
+
+     codes_mapping_setup();
      g_tw_mapping=CUSTOM;
      g_tw_custom_initial_mapping=&codes_mapping_init;
      g_tw_custom_lp_global_to_local_map=&codes_mapping_to_lp;