Added test for skip and fixed bug