Got testing functionality up and running
Changed application shutdown behavior to actually run properly.