change tests, add map