added launcher test and small refactor