remove unused method; fill in skipped tests