Fixed tests and added a test for skipped rows