Issue #22 - Fixed tag options and test spec