Fixed tests, changed namespace