Adding tests for cases in where binds and fixing them

This is in response to #38. Should only affect Gibiansky style.