Moved tests to separate packages, fixed #26
Added debug prints