Move these somewhere else...

The demo and integration test will be fairly involved.