Add in tests, clean up property to function conversion