added more to tests
servo_vs_open_test tentatively finished. run tests tomorrow
fixed conflicts