Remove "gradient" from names. It was unnecessary
Added more test cases.