Wrote more unittests