Some tests/renaming/cleanup on ShittyStub