Fix tests
Simplify dagger test module
Update gradle build