rename stuff
trying to fix tests
try to get grep working