Moved the future pimp borrowed from spray.util to the shared superclass that causes the need for it (due to a conflict in implicit resolution)
Tiny test cleanup