some tests not working, but fancied a commit anyway.