Refactored how files in /lib & /test are loaded