Improve tests
Fix for completely unused require first, then refers