Added function tests for this branch