Order results for events/series

Switch tests to use real mapper