Tested working version + test files