Synchronous versions fully working
Tests updated to reflect synchronous code