Fix problems with info functions and add more tests