Add a test_us and fix test to no longer break