Use test to make tests cleaner