build.gradle excluded, tests rewritten
build.gradle excluded, tests rewritten