refactoring
fix typo
simple changes
improve test readability
adds more debug output