Updated template and fixtures