Cleaned up files for added tests