test files + other fixes