Merge pull request #30 from daniellemayne/2014.03

2014.03 - capabilities fixes
Merge pull request #32 from daniellemayne/2014.03

2014.03 - fixed order of checks so that unsupported actions do not cause test fail