Thank you i feel a lot better knowing i did it correct. That is a very good idea linking the batten up to just the mains ignoring the switch altogether, i never thought of that. That will indeed tell me if something has a fault.
Your help is very much appreciated everyone. Thank you.