Minor fixes + tests from original repository