More tests and clean-ups in runtime-spec