Simplify import spec

Take advantage of helper methods and better built in matchers.