Fixed bug in Detection stuff
releated to namespacing stuff
Adding tests. Failing atm
Fixing naming of variables
Cleaning up test