Fix a problematic test, and add more things that should work
Fix a problematic test, and add more things that should work

olabini/ioke,olabini/ioke,bculkin2442/ioke,olabini/ioke,bculkin2442/ioke,bculkin2442/ioke,bculkin2442/ioke,olabini/ioke,bculkin2442/ioke,bculkin2442/ioke,bculkin2442/ioke,olabini/ioke,olabini/ioke