Added tests for the new volume mapper