Add more tests/grad checking