Providen test refactoring, java version downgraded to 6