Added additional tests and fixed to do