Some testing & minor bugfixing
Fixing unit tests (false negatives)
rebasing old commits, some refactoring related fixes