fix merge, add initial support for skipped tests and tests that need to be run serially