Skipping end-to-end tests from normal build; fixing code style