Work on the tests but not ran yet