Added a few more test calls and replace == false with !