dependencies organization on pom.xml
SwitchTest + switch bugs fixes