Fix'ed yesterday's bug. Improved testing
Stub now working as expected at this stage.