Add more test mappings