Mafefile fix

clean target fixed
Token can be output to stream
tests refactoring

- test main moved to separate file
- Makefile changed accordingly (clean target fixing)
- tests refactored to report problems in a consistent manner
- Don't worry, I will try not to make changes to filestructure anymore :-}