Added in the file stuff from 059dcc936e55d8473a3a683162a7d6e5ce3af3f8 to try and isolate layout problem. Tests passed.