improve(tests): fix Arquillian JBoss CDI tests and improve Spring tests