Add tests & mappings