- closed #17
- changed namespaces of unit tests