reorganize tests
Triple count tests
Use namespaces
control structures