Add Where tests, bound variables not working