Adding tests, correcting typos, handling maps