Remove desktop specific manifest and add skip logic to main manifest for appropriate desktop tests
Use SkipTest from Marionette instead of unittest