remove top level class references

So warnings are not in tests anymore