Semantics only
Refactor Stubs/Spies helpers and start of proper tests for them