Tidied up and added show test