Removed test items
Removed items that weren't needed and cleaned up the files a bit