@mattr- unless you think these tests are still necessary, I'll just remove them.