Cleanup

- Less redundant elements (no unused ```using`` and ```interna``` directives)
- Test names and structures a bit more *BDD-like*