Fixed launcher class. All tests now passing