Self Supervised seems to be running in a small number of cases. Now I need to test a few more cases. Adjust unit test and re-organise code