Add some other tests and fix skip parameter