Go into the wi-fi settings and make sure 'Smart Network Switch' is un-ticked - it's a feature of recent Samsung handsets that causes it to automatically use the fastest connection available, wi-fi or mobile data.
That could, potentially, explain why your data usage is continuing even when you should be connected to wi-fi.