cleanup of testing fixtures and naming in templates