Updated test files, and scrapped the old one.