fixed namespace issues
adding some more tests