create unit tests and refactor tag to namespace