test removing some duplicate code