Added some tests very much a WIP