Move scala test into appropriate package.