added exceptions and update Launcher
updated tests