#73 improve tests