Correct and stable test files 12/13/14