Adding typenames to tests