Move missed tests from previous restructure

-Two tests I updated missed the move to Gradle conventions:
/test/ -> /src/test/java