Fix unit test (remote services too unstable)
Extract methods from main method