Restored test files that Brett broke