Move test to standalone class , as it was in the beginning
Remove workaround as no more mvn tests exists