unit tests, map fixes(style&function)