fixed tests and added support for skipping files