upgraded gradle, fixed tests, updated controllers