Update issue 69 
more tests