small fix + more tests