[#63] Further tests syntax improvement