rewrote test files to make it compile again