Tests enhancement (#172)