Added some initial unittests