2: Fixed or skipped tests so that we can go green