corrected package name
first spec
spec for selecting instant
tidied
tests for additional mapping mechanisms