Add functional tests for these.