more tests and a few tips