Fixing unittest.skip calls