added more function tests
merging