Add more unittests