Some tests to verify completion is working as expected, also fixed up self binds to complete properly.