Changed/Added/Fixed: Removed unused files; added additional test