Add some more unit tests for staging.