add better tests for [ticket:2750]