option tests, couple changes in current API tests and some initial set of changes for server-tag tests
