improve logging, more tests