last 2 unit tests adapted to work with integer and string