Added tests for once.
Updated tests to use spies where stubs weren't necessary