Minor cleanup
Added dev-null as a way to write to a null device regardless of OS
Added upgrade in test_utils to allow adding in themed entities.