Starting to flag a bit. Restored tests so that they are based on Mikes code.

Technically then Mike - you can assume that nothing's changed (for now). Basically my version does not (yet?) work so yours is in still in use.