Added logging and tests for 1-map