add spray-testkit deps
modify models; add toJson methods; and remove ugly code from marshaller