add stripping to name as well as some more unit tests