Added discrete TEST class to try out and debug bits and bobs