rename some functions and break the transitive tests as they were not
truly working before

they worked because the sample set was the full transitive set
fix non-transitive test that was incorrectly specified