minor fixes, first tests