some fixes + first basic tests