Add test + sanitizing