Adding tests for cases in where binds and fixing them