improving test/grind setup