Added more tests and basic functions.