testing alias
use testing alias, where appropriate
Merge pull request #41 from mindreframer/feature/tests

testing alias + some more refactorings