small changes, more tests