Removed some superfluous things, moved WindowStub to /test.