maybe add electrode things in later, properly...
tidy up the test code a bit