Add test and cleanup loose %s