Cleanups to make testing a bit easier
Initial smoke test

(ie if we poke it does anything happen)