More tests, less bugs part I