rpearce: Move generic tests into local_spec, needs further work