Options unit tests

Replaces #194