Fixed issue in skip test
Enhanced unit tests and fixed skip offset bug