Stubbed out a test case
Changed the config to be more clear
Fixed ws issue
Fixed ws issue