Added some more test functions.