Add some other functions and tests