sorted template issues and made tests harder