Minor code cleaning
Fix minor typo in exception message
Rework of test embedded server. Create new JUnit rule for testing