make tests cleaner