added more functions and fixed tests