remove repetition in tests, some lint changes