use new test naming convention, make sure map entries implement both of the necessary interfaces, and propagate interface function metadata