Fixing up test file names
Adding plenty of thought to plugin