Add some funcions and their tests