Organizing imports on testsuite, adding spring-mock dependency