Add more tests. Fix namespace