Updated tests. Fixed gradle-test task