Added enumerable mapper and more api-level tests