[issue #353] [Fixed] fixed tests