#984;Add tests