small fixes + added first test