Started working on support for enable/disable masters and set masters keywords
Fixing more specs. only 8 failures of 224 tests now.